Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for sysbox issue #544 #77

Merged
merged 3 commits into from
May 14, 2022
Merged

Fix for sysbox issue #544 #77

merged 3 commits into from
May 14, 2022

Conversation

ctalledo
Copy link
Member

No description provided.

flouthoc and others added 3 commits May 13, 2022 03:57
NOTE: Cherry-picked from OCI runc commit b3d14488b5eeef399295d70d7acd49b451c20179
(original author flouthoc), with minor changes for sysbox-runc.

Signed-off-by: Cesar Talledo <ctalledo@nestybox.com>
NOTE: cherry picked from OCI runc commit 8f1b4d4a6f5cc1798c148bcf29cfdbdb465c44e3 (original author Kir Kolyshkin)
and adjusted for Sysbox by ctalledo.

Original commit:

This is a better place as cgroups itself is using these.
Should help with moving more stuff common in between fs and fs2 to
fscommon.

Looks big, but this is just moving the code around:

 fscommon/{fscommon,open}.go -> cgroups/file.go
 fscommon/fscommon_test.go   -> cgroups/file_test.go

and fixes for TestMode moved to a different package.

There's no functional change.

---

Signed-off-by: Cesar Talledo <ctalledo@nestybox.com>
Commit a6023ce introduced a bug that was causing sysbox-runc
to not setup the continer's cgroups properly, specifically
the softlinks under /sys/fs/cgroup such as:

drwxr-xr-x 3 root root  0 May 13 20:46 blkio
lrwxrwxrwx 1 root root 11 May 13 20:46 cpu -> cpu,cpuacct
drwxr-xr-x 3 root root  0 May 13 20:46 cpu,cpuacct
lrwxrwxrwx 1 root root 11 May 13 20:46 cpuacct -> cpu,cpuacct

(i.e., the softlinks were missing inside the sysbox
container due to a bug in that commit).

This change fixes this.

Signed-off-by: Cesar Talledo <ctalledo@nestybox.com>
@ctalledo ctalledo requested a review from rodnymolina May 13, 2022 23:15
@ctalledo ctalledo self-assigned this May 13, 2022
Copy link
Member

@rodnymolina rodnymolina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants